83d05e9176f3e885b53336cbbabb6f5c5d8d784c,source/net/yacy/kelondro/rwi/IODispatcher.java,IODispatcher,merge,#File#File#ReferenceFactory#ArrayStack#Row#File#,110

Before Change


    
    public synchronized void merge(File f1, File f2, ReferenceFactory<? extends Reference> factory, ArrayStack array, Row payloadrow, File newFile) {
        if (mergeQueue == null || controlQueue == null || !this.isAlive()) {
            Log.logWarning("IODispatcher", "emergency merge of files " + f1.getName() + ", " + f2.getName() + " to " + newFile.getName());
            array.mergeMount(f1, f2, factory, payloadrow, newFile, (int) Math.min(MemoryControl.available() / 3, writeBufferSize));
        } else {
            MergeJob job = new MergeJob(f1, f2, factory, array, payloadrow, newFile);

After Change


            if (f2 == null) {
                Log.logWarning("IODispatcher", "emergency rewrite of file " + f1.getName() + " to " + newFile.getName());
            } else {
                Log.logWarning("IODispatcher", "emergency merge of files " + f1.getName() + ", " + f2.getName() + " to " + newFile.getName());
            }
            array.mergeMount(f1, f2, factory, payloadrow, newFile, (int) Math.min(MemoryControl.available() / 3, writeBufferSize));
        } else {
            MergeJob job = new MergeJob(f1, f2, factory, array, payloadrow, newFile);
            try {
                if (this.isAlive()) {
                    this.mergeQueue.put(job);
                    this.controlQueue.release();
                    if (f2 == null) {
                        Log.logInfo("IODispatcher", "appended rewrite job of file " + f1.getName() + " to " + newFile.getName());
                    } else {
                        Log.logInfo("IODispatcher", "appended merge job of files " + f1.getName() + ", " + f2.getName() + " to " + newFile.getName());
                    }
                } else {
                    job.merge();
                    if (f2 == null) {
                        Log.logWarning("IODispatcher", "dispatcher not running, merged files " + f1.getName() + " to " + newFile.getName());
                    } else {
                        Log.logWarning("IODispatcher", "dispatcher not running, rewrote file " + f1.getName() + ", " + f2.getName() + " to " + newFile.getName());
                    }
                }
            } catch (InterruptedException e) {